From c790724469942adc1dfb906dbdc68ee28ccb3b33 Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Thu, 19 Jan 2017 21:23:51 +0000 Subject: [PATCH] combobox: Make wrap-width and grid mode work again MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit fdc0c6426b6fb751653f3a8536a344f69a6407ac for removing (partly!) appears-as-list also deleted the code that propagated wrap-width to the TreeMenu and thus put us into “grid mode”. This restores that code. And as Benjamin noted, calling check_appearance() here is wrong, so bye. --- gtk/gtkcombobox.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 3fb8222d35..4ca31f4b3f 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -2775,7 +2775,8 @@ gtk_combo_box_set_wrap_width (GtkComboBox *combo_box, { priv->wrap_width = width; - gtk_combo_box_check_appearance (combo_box); + if (GTK_IS_TREE_MENU (priv->popup_widget)) + _gtk_tree_menu_set_wrap_width (GTK_TREE_MENU (priv->popup_widget), priv->wrap_width); g_object_notify (G_OBJECT (combo_box), "wrap-width"); } -- 2.30.2